Added custom post type support