Add ServiceBuilder class