#time 10m - some entity improvements and authorization