Add support for custom (calculated) fields in the data models/types/names