Added picture_controller and story_controller