Added remaining icap plugins and updated constraints