Updated the schemes and some aliases