Better syncLock handling, removing common classes