Create interfaces
Update to use new interfaces