Improved Entity structure to Open/Closed principle