Added '#' ref in expanders