a bit of changes to get rid of current regex support