Add uuid generation in dispatcher