Update for new features

cf. #93