Refactoring to simplify import and properly switch between Local and Deploy configs
bug fix for import error on deploy
bug fix for missing deploy import