Adding extended tables feature