Add table and integer parsing