Add initial support for button states