Add better customization support