ADD - continued Model refactoring