Add some improvements