Updated for the new version 0.5.