Abstraction and work on new data sourcing.