Temp fix download template (needs some refactoring)
Client service partial ref