Minor changes to Create()