Fixed ExtractAll and added putAll