Add support or additional fields