added TODOs for model generations