PLAT-3030 - Added in future options