Updates all code to become library agnostic