Refactoring empathy lib.