Fixing unnecessary hard codings and added needed db table scripts