Refactored and isolated the KEVD factory