Refactored deprecated types