Preparig for dispatcher 0.4.1