(Field and Switches not working) added Switch parsing