Added categorical support