Added logic for maps
Next approach for the nth syntax with add ons