'Add New' code refactoring