Updated Custom Post Type Plugin