Cleaned up the disruptor entry types