Use resolver instead of arrays