Add support to skip tables