Added changes to fix review comments