Refactoring.
Update regext