Changes for internals