Add optional timeout/unit for blocking on execution and then on callbacks