Refactor mandoline and add roles handling