ADD - Some improvements