Change to support adding new screen type