Added name field to Matrix