Add more general aliases