ADD - Continued Model refactoring