Added support for key settings