Added support for tablespaces