Add fixtures
Fix entities