Modified the medusa aliases to have it in two files and merge thir branch with master.