Refacotring collection, fix duplicate resolver array