Moving Query creation to routers.Extract
Fixing messages
Registering models