new tables added and bug fix