Changes on Feature module