Improves entity code and exposes its geometry