Modifications due to the pull request issues