List and Create updated to work with Directories