Fix docblock
Add more fields