Making it less HTTP dependent