Added one more TODO
Prepare Content-Classes