Change function signature for maintainability