Issue #452 Re-designed system structure