Refactored structure for simpler include