Refactoring: preparing everything to extend the module with validation.