Refactor to bundle with new urls and service by service