Follow code changes from LASM