- fixing dependency problems
- some inheritance changes

Signed-off-by: Marcel Schwittlick <marzzzel@gmail.com>