Added options for customizing by name, manual verification