Add extra docblock info
Structure test
Improve docs