Better Tracks management
Split each request in one function