WIP: Add content types