Added skill types. Renamed shield user