Sync with main classes