Change main architecture to base on RegEx.