Just curious why are moving all the constants back into the system? Its not the best decision the way Keys work, but this one may not be a good way to do things, IMHO.