So you're basically telling me to revert this to the way I had it done before? with the methods in MabiProp and MabiCreature instead of MabiEntity?