I think we need Keys.java back, till we replace it with a better design! It maybe not be the most optimum solution atm.