Major refactor of internals