Added velocity support and graceful fallback for animation types