Updating for new scala version