Improved auto rehash mechanism (now supports my aliases)