Updated for version 0.8.