added new wrapper files for container- and signalfunc