Updated addressing types