Updates following Button API changes