Added simple service & some simple changes