Changes to support previous review comments