Added conditional attributes