Added doc number support