Update Popcorn with Pop 1.2.0, add Service Locator to defaults