Support for user and system tables scope was added