Adding support to parse tags