removed const from entity functions