[fix] Adding some improvements