Refactoring for additional platform-specific features