Add more usability