Optimisations, HashMap, package changes, and indexOf()