Added fields for remaining models