Add service
Fixed server background threads