embeddable entities (thanks to EntityDescription), removed ENTITY
constant, more flexibility, better tests