Add tags so that the JSON is serialized reaaaaal good