New data
Misc code refactoring