Improve supported container checking