Changed to explicit spb_common module calls to avoid confusion with other loading modules