Security fixes, add connector primitives