Code refactoring
Updating data model
Merge branch 'master' of https://github.com/fasteque/MyFLP