ADD - Add some models and working on lazy loads