Interface change...flagging for 0.6.1 (not a bad thing)