Few updates on set/where generate func.