Refactoring for multiple bonus tables
Added multiple bonus table functionality