Block - move mappings to xml