Added attributes manager