Internal data-structures changes