Added Pundit
Refactored schema