Documentation extended