Updated to work with semigroupoids 4.0