Moved away from giant switch case
Updated deps