Enhanced tracking and mapping