Added attributes, HP, EP, and elements