Preperations for Wave v0.58