Added usability tools