Adapt CSLib changes