+ Changed internal logic and bult service layer and proxy layer