Updated dependencies. Cleaned up interfaces.