Added recursive entries and newest changes