Removed proxy based iteration for files, added proper ResourceFactory