Adde support for up to 13 attributes