adding separate mapping rules