[Jason, Manju] fixed focus on new modules