Added context data for Builder objects