Refactor: Remove the generic from Content entity to simplify the design