Refactor code and update test.
Update POD