Added much more into the shared service