Changes for independant library of standalone l3 code.