Base: refactoring options merge