Added support for other states, will be used for menu and settings later