Refactor on 14 to use one array structure