Tags & custom data overloads more generic; tests added