Pushed functionality up into shared
Using latest shared service