Feature/named callbacks

Move to named callbacks, they are more powerfull.