Added entities
Update routing and security