Adding tables and modified vhdl