Changed to dictionary based parameters