Minor release containing few improvements to component-contribution model