Adding custom input tracking