More changes for Beta 4