Added entities used across mcts and care-reporting