Use service module instead of command