Updated Document class