Improve aliases, functions and exports