Final changes for 1.0 beta