Rewrite parsing code and include area and uses