Expose Some Types For Backward Compatibility