Removed dependency on external sites