Moved form to enum for easier updates