Add tag inputs and serialization of attributes