Remove use of subclasses

This fixes issues when defining a dependency relationship in other module