adding support for extra fields