Added new syntax allowing use of longer names.