0a35964 Add more general aliases