Adds support for some different system configurations.