Simplify aliases
Updates