Added helpers and refactor add_squad