New interface is good. I'd go for option 3, but I'm not exactly a significant part of the dev. team. N.