Delegation pattern

Delegation pattern

Fixes #41 issue.