Move add callback to separate method
Make callbacks take fixed values