added more fields