[TASK] Adopt to better signal slot implementation