BugFix: Setting & entity definition