Better curl support