More customization changes