Minor changes to v2.0, needs some further refactoring