Fixed invalid class name
Cleaned up logging
Added support to attach tracker to Navigator