Add Cap support