Model/Component refactoring
bugfix