Add compat with bipods to CUP #5