Add matrix standalone class