Expose properties
Add more info
Fix names