Added the ability to find custom names