Added usual component/component stuff