Move the responsibility for handling -- outside of $daemon