added more fields and tests