Inner class support for entities, improved message for exceptions about decomposing.