Fixed Core-201 - Added triggers for tracking simulator