Improve mapping related scaladoc