Adopted API changes of 0.1.94