Improve quality for component module