Make resolution parsing unified into an object