Fix API for Table