Document Model fix