I would vote for the second solution.