TODO list added for 0.10