add suppport for None