Added customization support