Bugfix
Removed ContainerAwareInterface. Use setters instead