Added attributes for additional code