Add SelfControl support