Used get_class to determine classname off ServiceContainer
Typehint parameters
Merge branch 'develop'