Using sharded classes instead. Need to fix unit test.