Better reusing of all entities