Updated the type definitions to match recent changes