Improved the model system. Moved from decorator+dict to class+list