Including and improving custom post type class