+1 for second option (another level to the hierarchy )

+1 for doing it in a separate PR