Consistent callback naming.
Add extra properties