Refactored Talks CPT
Refactoring and adding CPTs