Merge with components from noflo