Added primitive initialization
Fixed up FieldDefinitions