Release 0.08.12 - Handle domain of entity