Updated code to support new stuff from 0.1.2.