Add attribute parser
Complete simple parser with attributes