MakaraAdapter support