Update Class Design

Added options for user class look for #2