Adapted API changed. #53