Fixed Animation and more Wave support