Add Cap 3 support