FIX: Use new Canvas args