Adding more unit customization