senario and config improvements