Add very basic support for remaining fields