Additional createsuccess changes