Removed dependency to external HTTP-Client