Customization improvements