Moved old types