Refactored some playbooks