I don't have the time to split this commit
TODO: Update the documentation in the README to reflect changes