Document model enhanced