Added handling of attributes not being specified