Temporary changes in method signature for testing