Added disabled fields