Got rid of attributes array