[TIMOB-15980] Added User-Agent and moved things around