Improved readability and added the ability to specify the field name & id of the selectors