Rewrite of class
Change meta keys to have `_` prefix
Merge branch 'feature/new-architecture' into develop