Refactored add form