Specification : Integrate review remarks