Fixed constructor. Now matches other Entity's