Starting big refactoring, types of notes should be introduced