Updated with new entities