New definitions to conform to