Refactored To Enumerate Data Type