Refactory List Entity Class