Update and Added features