What you'e posted is more than close enough for most purposes. It is really only historical records that need to be more comprehensive.