Merge and also add a few more aliases