removed hardcoded table name
removed common functions to base class