Added geo and mapping