Add service and some fix