Separate daemon and non-daemon commands