added attributes and more resources