Added description support, <> no longger needed