Improve method signature for helper functions