Major refactorization (removed magic methods)
Removed model class for it had no purpose