(DI-1811) Basic Customization