CS-4921: Removed TW specific indexable data
CS-4921: Enables classes to be easily extendable
CS-4921: Makes class more extendable and removes TW specific code