Added more formatting and tracking data