Updated models and added fixtures.sql