DEVELOPER-813 Added a few additional items