Added service and session classes