Got rid of magic strings and reflection code.