Acode, Entity and Role improved.