JDE refactored to OO Design