Improvements to Directory API, and Model