Fixed EntityProperties not loading