Modified service a bit to handle new json design