Some refactoring to allow for multi input blocks