Cleanup. Added also proof of concept of adding dynamic sinks with different input types