Added some improvements