added option to change fieldname