Updated model extensions for ONE