Updated for more detailed entity information that can be logged over time
Git being annoying