Separate dynamic field creation

Make it easier to add new ones later