Added callback param support