Simplifying attribute definition, adding child node definition