Updated todo with CDI tasks