Refactored StateControllers'