added more fields and entity objects