Improved Cape API