Please add unit tests for this class. It should be tested aggressively.