adapted builder to new parser