Now using Java beans instead of hash maps.