Added class for custom fields