Added wrapper creation in the daemon handler