Minor changes
Project uses ORM annotations now