Add possiblity to have callbacks