KD: Changed structure
Added Category