Add factories
Fix new notes classes