Expand initial_usage functionality.
Fix onRevision support.