TODO: update xml schema (wait for #167 to be merged)