Added regular expresions