Added conversion matrix