Added one-to-many, many-to-one mapping capability; fixed related bugs in multi-occurrence mapping