Added batch setting to components
Added batch timeout