Changed struct of content and type