Added base directory specification