Updated to allow method and parameter wrapper