Improve methods with optional params