soap refactoring & added rest services