First pass at version 3.0 updates