Added attribute and visibility parsing