Update after ScalaCamp #6