Extended Reference Dictionary and updated input system