Add ODI layout
Make content_api and statsd into methods