2.5 support: Used Interface instead of implementation

Fixes #189