Added missed changes