Modes refactoring
Modes names  refactoring
Adding Note
Refactor fields
Custom field proto
Fix coverage with