Change signature and return value of callback