Adding specialized custom fields instead of the short cut version