Implemented review comment