Documented / Refactored Component module