Added ability to alias names