Moved getFrequentReenterPoints and getCharge, updated javadoc and UML