Added some minor additions