Added direct regex support