major refactor of code.
update custom field binding