cascade configuration works now + small refactor