Made DFF entity generic based