Some refactoring and can query arrays again.