Some work for stencil less config