Moved Actions and Commands into Types