Adapting to latest list of possible attributes