Types refactored.