Added form discovery