Removed const from entry members