Added helper types