added more selective imports from Matrix