Some restructuring and add calls