Improvements in captured functionality