Get attributes working better