Adding direct canvas support