Small changes to synchronization base impl to allow extending it