Refactored added form extensions