Added all fields to prop model