added struct injection, parameters