Adding support to parse elements with attributes