Adding minor changes to match with tables