Added proper Models and Collections