Partial implementation of the new charges framework.