Addressed more review comments