re-impl world/entity maps