Updated code to reflect new org version