Made return type defs into def list