Fixes and refactoring
Add default result and fix trigger function for non-void signal