Added better support for rendered fields and custom fields
Added support for custom fields