Some changes to make new document creation easier.