Added some improvements to the usability.