- added more optional fields