Added category definitions

Change-Id: Ia1f06d140231118369a1282329db78c9abc19a8e