modify internal codes to use Collections#singletonList()