Issue #19 - Customize components