SwC improvements