Made a few tweaks regarding the entity interface.