Removed optional ids from model classes.