Moved to component model