Fix breaking SDK change with extending HashMap