Adding aliases option, minor refactor