Moved Actions into a separate module