handle different versions of daemon module
merge