Update and fixed export