Added new property CurrentCategory