Updated interface and some tooling