Moved alias code to own class