New internal features