Added LPM support