Add missing info from Master branch