Exceptions cleanup, As<Entity> interfaces