WIP extend regexp