This should be mandatory service