Added better parameters for callbacks