Changes for easing installation process