Update added enumeration of types and IDs