Final changes for Beta release