Initial commit with regex support