Moved location webservice call into service