Re-enabled internals