Added states to Controller