Updated files and model

Switch case statement
MDL