Add s3table, remove redundant decorators in cbtable