Changes after ScalaCamp #7