adapt to the latest aloha api