Add missing property and correct docblock.
Correct docblocks.
Add Import