Viewer refactor
Updated service provider
Test refactor