Issue #174 - Add implementation