Implemented custom fields