beta 1

update service layer and controller layer