Can we create a enum and remove entry types hardcodings ..