Move locking to only main moc