Adding const protection to match engine updates