Improved Curl class