Add l4 specific stuff