Create more granular interfaces to limit scope to possible use cases