Small refactor to use Collections insted of arrays in Elements