Add CAP support