Refactoring for model and collection base classes done
Bug fixing