More types in Entity.py