Refactor Standard Types solutions