fix service, add validator