Improve Signal/Slots