Updated to support Ice Mountain