Playbooks improvements