More work on custom post type support