[#72] Some package level changes [Manasi/Kalyan]