Add daemon lock and register support