Improved object structure, serialization, UI