Updated for latest dependencies and abstractions