Updated full export