Refactoring, splitted annotations for spreadsheet and view mappings.