Changed Service class to Wrapper class and added callback functionality