changed setter/getter methods and improved models schema