Add support for more SA objects in get_tables func