Add more specs for entities
Prepare 0.37.0 release