Updated to work with release 0.1-74