Adding enum support (Roy W Bradley).