Updated directory schema