Modified to use akamaddiCore