Major refactor after rename