build proper Hash index for plural
add Macro and remove the whole plural logic