More work on content types