Refactoring visualization but leaving the services and the API the same