Updated JDoc to use cleaner hash maps