Adding a many of enumeration for object, fight and a lot of modification.