Added support for per-user directories