More work on generated xml files for concept calls