WIP: l.lwa/l.swa support