Added matrix constructor