Component Category

This is a request.
Under Component - General tab, the category has 6 options: Server, Desktop, Database, Firewall, Printer, Appliction.
I'd like to have the option to select Network, Router, and Switch with the appropriate icon.
Category: Network       Icon: Cloud
Category: Router         Icon: Router
Category: Switch         Icon: Switch
This would make the Infrastructure map make more sense.
Thanks.