Removed duplicate functions using optional values