Refactored Common project.