Secure parameters refactoring