I don't think we need this interface.. Can we remove it?