Service & config improved