Refactored data types