Updated to latest DefBook changes