Added reflections and minor changes to some attribute names