Changes callback to more generic