Improve loader to find all specifications