changes to work with dispatcher