Refactoring. Version 2.0.4 release.