Make services separated from UI