Ported old types for better compatibility