Semantic plumbing added