updated
updated mapping and added queries