Update handling of types in attributes