Fleshed out the data interface a bit