[ issue #6] additional mapping rules