Updated JDoc and controller