Adds some suggestions and introduces Directory implementation that is
friendly to JavaScript