Added Entity Registry