Refactored types to be more manageable