Updates for public beta