Also add new multiability handling for it