Refactored crud generator templates