Updates to Daemon and core