Use of List

Added commands to simplify code.
Removed enumeration.