Moved properties into fulfillment