Added builder, also update and vars fields to elements