changes on attributed and compose entitiy