Move functions to alias file