Added support for nested/current directory