Added aliasing functionality; simplified autoload.