Updated to use DeltaSpike project