Data model refactoring. Moved all to N.app