Master issue 42 db support mapping