updated mapping to increase performance