Added tracker service
Added tracker dummy service
Sonar fix
Added more options