Added functionality and data capture