Made tag api more uniform