An improved component-mode representation