Adding cap3 support