Added attributes to various models