Parameterising classes in container configuration

This PR parameterises the remaining classes in the service container.

Fixes #64