Sync with main app classes
Sync with main app classes, trivial