Changed models and fix bugs could not build project