Upgraded deltaspike