Add basic cap support