adding better mapping
adding better mapping