Adapted to LMVC changes