refactoring; added new tracker commands support