Symbolic link management and tablespace support

Modified code as per latest commits