Updates for shell daemon, main daemon and api