Updated table names and api methods with where
Updated table names and api methods with where