[CORE-74] Working on ONE extensions