Update as per review comments