Pull request: Entity modules. Closes [gh-466]