Added helper fields