Added textual coverage
Simplified architecture (common methods moved to Composite namespace)