Extending the functionality in the previous commit.