Added Parse models. Refactored some code