Added waypoints, animation mixin