Move some code to new style signals