Add more changes for Anancy