Simplify capability code