Updated to include localM as feature