Improvement of the interface to create only signals we need