OSS refactoring