[Bugfix] Refactoring & Model path & attribute handling