Made changes to parser and service layer.