Updated with new attributes