That sounds good. It reduces the number of interfaces flying around, and makes it clear where they are used.