add more modeling and mapping