Minor addition of functionality + tests