Added table retrieval for component pages