Added some aliases and moved them into separat file