Moved some wse calls to services.