LDT-1010: Custom components